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

Change-Id: Ib222f7a1f0a43d6b0adea55afca349dc6bd83319