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

Change-Id: I47cf1b23a555918c149df565dc004aff40edbcaa