Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 3875d1a103  -s ours am: 995029b529  -s ours
am: 1e8ed22be2  -s ours

Change-Id: I1590d538bffee3129a6b7a840936d9eae44b851e