Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 9bc30ce545  -s ours am: 611a6ffe29  -s ours" into oc-dr1-dev
am: 527cd8b04d  -s ours

Change-Id: I6b4285fbad58d296305cee0e6698dd6925538024