Merge "Reverting ag/1288123" into nyc-mr1-dev am: d983386c31
am: 9bc4d36796

Change-Id: I89db474b4dc0953291a403a6f35f667f5bbab23b