Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5e6fb1699f  -s ours am: dcc4542c05  -s ours" into nyc-mr1-dev-plus-aosp
am: 11f8c5381a  -s ours

Change-Id: I5d97d38e85bce8af7100b4f28720960e9991ee31