Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602  -s ours am: aec51f497c  -s ours am: b57520aae6  -s ours" into oc-dr1-dev-plus-aosp
am: 0b190bd9cb  -s ours

Change-Id: I1e3ad36dbf4006672487447f37bb7a65f694dc5e