Merge "Import translations. DO NOT MERGE am: b004945727  -s ours am: 6919758aba  -s ours" into nyc-mr2-dev-plus-aosp
am: 1290cbde22  -s ours

Change-Id: Ic945b09ec5d7101d7a6584964b0c2f555eff4dd9