Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01abe42307  -s ours
am: a010b535d6  -s ours

Change-Id: Ifc752df4fd993acae6f55d3321bd0e31378213ec