Merge "Reverting ag/1288123" into nyc-mr1-dev