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

Change-Id: I8d85ddb74f1b9bbd858bd3c82e1d1078662ffd8c