Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 01422e1ff5  -s ours am: 9467382a44  -s ours am: 2e2dfc94fc  -s ours
am: b68b01872a  -s ours

Change-Id: I7e37986af29b210c35633c9c2f126b4629d99fbf