Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 0705a5136e  -s ours am: 42d8dccd89  -s ours" into nyc-mr1-dev-plus-aosp
am: 0b2f35fb3d  -s ours

* commit '0b2f35fb3d60ef3a0ecd03b60b6e44e7793a575c':

Change-Id: I52406b4c661ba3a5a4857eb502826af5abbb3853