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

Change-Id: I29a6119ba5af97f06bd7ec41a847d3cfb5fad707