Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d8a450557e -s ours
am: a27dbcb4a9 -s ours
* commit 'a27dbcb4a9d7ff8be8ac28016a25ee4bea8a4fa5':
Import translations. DO NOT MERGE
Change-Id: I0362623f474ea9eb8d7581e4581226ee1c81bdb3
This commit is contained in: