Merge \"Import translations. DO NOT MERGE am: cdd4f84e06  -s ours am: f3b6338d0f  -s ours\" into nyc-mr1-dev-plus-aosp
am: 5ff22074ac  -s ours

Change-Id: I5a5f63275aba246913eb87fcf6acd1e3be1c048e