Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57e29b4b9e  -s ours am: 902770c469  -s ours" into nyc-mr1-dev-plus-aosp
am: f246677e10  -s ours

Change-Id: I3925ed158ec515393827ac69a6c8c56bf7aaab42