Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103  -s ours am: 995029b529  -s ours
am: e861cf8791  -s ours

Change-Id: I21a201b97f23604d927f39fa2f7e64365cb5d27e