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

Change-Id: Idf454d7e6c0bb2b1c5e5d91620f8bfc5c5c3f114