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
am: 4535888bfe  -s ours

Change-Id: Ia884fd281f133591d9c240cd07412f5c5eff9ed1