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

Change-Id: I7e08a623df53f4464d67d6b5a4cf27bb99aed279