Merge "Import translations. DO NOT MERGE am: 69d0838208  -s ours" into nyc-mr2-dev
am: 3bcdbff889  -s ours

Change-Id: Id70f146241685a88bc2ba075d8e78745fd826878