Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 7ad5111905  -s ours
am: 1efc31d6a6  -s ours

Change-Id: I8a050bf598ec6de7a6d0138bba5bf0dd313821b3