Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: d3259bd75d -s ours am: 4225723bf8 -s ours am: d74cd6afa1 -s ours
am: 6701ad2d00 -s ours
am skip reason: subject contains skip directive

Change-Id: Ice83d7bc3b4d4d910d863d8f5b4d8b5ff2c7d9a9