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

Change-Id: I46dd20dbc70e30354ce0773181ef7e83d926ea35