Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: aa8fa12600
-s ours
* commit 'aa8fa126007335aff2f921b2923c81de7115f0ba':
Import translations. DO NOT MERGE
Change-Id: Id38b5f8008eb22608714420fdc78b1f632ee222d
This commit is contained in: