Merge "Import translations. DO NOT MERGE" into nyc-dev am: e6a875576f -s ours
am: 8c648f3fd5 -s ours
* commit '8c648f3fd5b3dc776f52a72b4d248cfa0baba655':
Import translations. DO NOT MERGE
Change-Id: I49326528232aaac98c1b6830bc35505ff86ccbfc
This commit is contained in: