Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 1c25c67a6a  -s ours am: 919ba24275  -s ours" into nyc-mr1-dev-plus-aosp
am: 424e13df65  -s ours

* commit '424e13df65d80e4883a96298a46891ee2a8ecd80':

Change-Id: I3ef01a3890e8912920ee46dbc840d000ea4d976f