Merge "Import translations. DO NOT MERGE" into nyc-dev am: 7efa4cc6de
-s ours
am: 172b04e468
-s ours
* commit '172b04e468583fc7c29970b1ca6aa90f69c1e713':
Change-Id: I480d61a4ba7c9033b31cc4dd1daa11e483812928
This commit is contained in: