Merge "Import translations. DO NOT MERGE am: b3a6a7afe4 -s ours" into nyc-mr2-dev am: ddca547792 -s ours
am: 0bdc868a4c -s ours
Change-Id: Id884ab05c086e3b37865ea0ecfa36eb39216a4a9
This commit is contained in: