Merge "Import translations. DO NOT MERGE" into nyc-dev am: dad7b893b2
-s ours
am: 5587701c86
-s ours
* commit '5587701c86be3a78b9b08e3841ca186cbf2acc64':
Change-Id: I5c2fb2801b85c48fb52ae804323bee66f90b78f7
This commit is contained in: