Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 123637175e -s ours
* commit '123637175e0127672a8fa8c52c155abd8dd0dae6':
Import translations. DO NOT MERGE
Change-Id: Ib14f9450c24ebe600c582b5dbc43fde082d09be3
This commit is contained in: