Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d84995e18f  -s ours am: 782e55f75c  -s ours
am: bd811838f7  -s ours

Change-Id: Iffcf95ab7e3f336662aa2f7f2399b1917fce56be