[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours am: 2f0bcbd3dc -s ours am: 609c18fa9c -s ours

am skip reason: subject contains skip directive

Change-Id: I8445077fdd45eeef080c10e72ccd07fa233d2663