Merge "Import translations. DO NOT MERGE am: 4fd35e05 -s ours am: f46f825e -s ours" into nyc-mr1-dev-plus-aosp am: 2ba46094 -s ours Change-Id: I09fca97d0bb4b6c6041dedc6ef4a3a47833592f4