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

Change-Id: I0a31793f01e54a372d4ec109b4065b88e43a6e92