Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: 3831df7485 -s ours" into nyc-mr2-dev-plus-aosp
am: 529383ef3b -s ours
Change-Id: Ifd479068f20b3c038f53ae69a69ee83df753f3af
This commit is contained in: