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

Change-Id: Ifb7fb7717bcebd0a94e8906a539d6377a5f2b31f