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