Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de
-s ours am: 172b04e468
-s ours" into nyc-mr1-dev-plus-aosp
am: 9b1a3d9960
-s ours
* commit '9b1a3d996039032a456bb4b0bd3c8d98f4df59f4':
Change-Id: Ie80139f50bac582667406a79ec054481c2d6edf0
This commit is contained in: