Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 732a35eb23  -s ours am: 1ba6831726  -s ours" into nyc-mr1-dev-plus-aosp
am: 53da4dd94a  -s ours

* commit '53da4dd94a50d6ff6cb37b007bcdf45b700ef114':

Change-Id: I39b4ac0e34d21d20953e7e25486c6ed62e5ae69a