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

Change-Id: Ib4a6053517fb47a38921507c82b8d9d79ef51ea8