Merge \"Import translations. DO NOT MERGE am: 07edcb65d1  -s ours am: 3a28377c51  -s ours\" into nyc-mr1-dev-plus-aosp
am: 656010e4c2  -s ours

Change-Id: I56ebb45c30e7d8e866fe91125ceab481a71ac7ee