[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 5d25caa87a -s ours
am: 823142f20a -s ours
am skip reason: subject contains skip directive

Change-Id: Iea4abd71dc28b03b172f96812450ee3fa28561aa