Merge "Import translations. DO NOT MERGE am: b3a6a7afe4  -s ours" into nyc-mr2-dev
am: ddca547792  -s ours

Change-Id: I116f3150b8a20cd02a93b3f01619c4178c318e20