Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 57bd22ffc1  -s ours am: 347f2b60b5  -s ours" into nyc-mr1-dev-plus-aosp
am: 571b44289b  -s ours

Change-Id: Ica5c639ce2a02fadfcd74c6417491c1eeb16c88e