Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a1 -s ours am: 995029b5 -s ours am: 1e8ed22b -s ours Change-Id: Ie174a36ad5952ec42926dbf033f6887f43a228d8