Merge changes Ic83c3f8f,I7ed954de,I7780c389 into nyc-mr2-dev
am: d792f9d032

Change-Id: I4974f56b4c47f55e337e7f0ca5fb5cbd35b581b1