[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 295b1dba78
-s ours
am: 5f6178d44e
-s ours
Change-Id: I08fcccca60f4c3272005851cc672ecd42eb0164a
This commit is contained in: