Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 86875e592a  -s ours

Change-Id: I795e3260079e0cbba134235b7315ff4cbe67342a