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

Change-Id: I55aad5355130ace0d3b8826620b1bf1d0470ce23