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

Change-Id: Idf09e4eb6e5adadef19906061e3e656227256e1f