Merge changes Ic1e2f5e8,Ida4a3fc1 into nyc-mr1-dev
am: e2782906b5

Change-Id: I2b32773759a471217bf334ea1d3f02d3fc60a4e9