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

Change-Id: Ie0fe332acd451e52da6dc7d69aa46e9f55c9c614