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

Change-Id: If16efc19e86c260008ca4617d1dde937656cfe57