Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 197da1f978  -s ours
am: 5501036062  -s ours

Change-Id: Idd14727a629fbd7eca5a1d81e7c56ad52053b2fb