Merge "Import translations. DO NOT MERGE am: b0049457 -s ours am: f1a5ffbf -s ours" into nyc-mr2-dev-plus-aosp