[automerger skipped] Import translations. DO NOT MERGE am: 2494723d40  -s ours
am: a8302ec028  -s ours

Change-Id: I166bbdd46a77f4d8393db2389145c580db7a3d99