Merge "Import translations. DO NOT MERGE" into nyc-dev am: cb8c569414 -s ours
am: 8272bb6af4 -s ours
* commit '8272bb6af49a6ce8803e54c92fe63a095bb23a24':
Change-Id: I676d3e4ac37db3b933d775e6b886c9cc5a38c8d2
This commit is contained in: