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

Change-Id: Ia73a0deae986f468d1ad429089dcb2740826f2f8