Merge changes I9b4f1107,Iffd3eada into nyc-mr2-dev am: 19b4efe419 am: 2826d6797b am: a991398ada
am: 0ff8378008

Change-Id: I443362c46d8ac4a6999ad5d9d3be6bbca5455be3