[automerger skipped] Import translations. DO NOT MERGE am: 0c8515698a -s ours
am: 7a81c68515 -s ours
am skip reason: subject contains skip directive

Change-Id: I140dc9ee5d1fc75513547249ae0276fdab5488e1