[automerger skipped] Import translations. DO NOT MERGE am: 885dfb7134 -s ours am: a7fd1427da -s ours
am: 92a95bc537 -s ours
am skip reason: subject contains skip directive

Change-Id: Iefb137b703cf19e3c419ab015bd0b386d9ae6279