[automerger skipped] Import translations. DO NOT MERGE am: 7c1d2737a2 -s ours
am: 5077a319b8 -s ours
am skip reason: subject contains skip directive

Change-Id: Idee61938a50c680b68cb3532ab5349e8c8eecae1