Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: aef6baae73  -s ours
am: deca08ff76  -s ours

Change-Id: I1b27b41f45d4f01058d5ebc34175c1469fef5c63