Merge "Import translations. DO NOT MERGE am: 2317faf4d9  -s ours am: 2787b2d5df  -s ours" into nyc-mr1-dev-plus-aosp