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

Change-Id: I93766f2c63586fd097f0dd6f590bdeb73b5fdb95