[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 8f5b3f19b4  -s ours
am: ee37ad8a96  -s ours

Change-Id: Ib5ee7ffbeeec68cfccde24ed6bc59e7c53782f1a