Merge changes I703ea278,I2c517d0a into nyc-mr1-dev
am: d8fecad31a

Change-Id: I4bce916df11cea3b72348cad35203a537dabd9d8