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

Change-Id: I90c83ec8ef40cab730481551b3342d7acc7fc66f