Merge changes I40064d3e,I50594ad8 into nyc-mr2-dev
am: 7eaec196b7

Change-Id: I85c6652d8cdfc387b27fe2a11026c05b5df667a5