Merge "Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ca1d7b278 -s ours am: 2a5ccbbe9d -s ours am: d5f0c0f842 -s ours
am: afcdeda090 -s ours
am skip reason: subject contains skip directive

Change-Id: I7757c98972ee2de40e0fec0fc9afe66168e3992f