Merge "Import translations. DO NOT MERGE" into nyc-dr1-dev am: 9f7b9a8352  -s ours am: 07225a0fa0  -s ours
am: ef47d17d89  -s ours

Change-Id: Iedbefd905c76643392aa73f104d0dc4b2523e9c6