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

Change-Id: I40019824e3d81b437e3aad80f0ba3f609bc45a56