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

Change-Id: I7beccc9f82d7c9d111b8fe2eee1d0b7489b22db3