Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103  -s ours am: 995029b529  -s ours am: 1e8ed22be2  -s ours am: 9b16c7b2bb  -s ours" into oc-mr1-dev-plus-aosp
am: c015001f98  -s ours

Change-Id: I4acc5b60ba716f7f57e74f1744a4bb138dc6d073