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

Change-Id: I8acce36561def08ea6e6802d86c8b3ddbbe150ad