Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 591da2277b -s ours am: e920ffb1b4 -s ours am: d7f7590138 -s ours
am: ab9f5f06e9 -s ours
am skip reason: subject contains skip directive

Change-Id: Iba12481b5ecc14f964a6dfe3fa38ce2ad1c20fc7