Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 92bd012829  -s ours am: ca6669ca12  -s ours
am: ed64bfc1b9  -s ours

Change-Id: I93112c4986b0112b259dbc2585ddd7138dfab884