Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: c2b08ca602  -s ours am: aec51f497c  -s ours
am: b57520aae6  -s ours

Change-Id: Ia18d1bbc60892f9775bfc6484db97ee5750b9e9a