Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 7e212ae873  -s ours am: 71398a5624  -s ours" into nyc-mr2-dev-plus-aosp
am: 2231f7a3fc  -s ours

Change-Id: I0c61d63dbf099dc53e6047811c4f9a9cfd95b8d8