Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 496d17f748  -s ours
am: 0f106f5744  -s ours

Change-Id: Ibab00657197612ed30ac08888826e3a7e132f5ad