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

Change-Id: Ic6152a928385bfc4c32bc41aa2542266d58eb0ec