Merge "Import translations. DO NOT MERGE am: 07edcb65d1  -s ours am: 3a28377c51  -s ours" into nyc-mr1-dev-plus-aosp