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

Change-Id: Ie9af9597b4e56cd4501cb86d7dc7d67cbc7f52e7