[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 6fe3e60d9a -s ours
am skip reason: subject contains skip directive

Change-Id: Ieb00cfb80ce0b53b1add48017ce5f448e8de8a37