Merge "Import translations. DO NOT MERGE am: c30efc0214 -s ours am: a40b64efdd -s ours" into nyc-mr2-dev-plus-aosp
am: f65de74901 -s ours
Change-Id: I029e8716b8904ac91ef36346fa5bf668f1f2def7
This commit is contained in: