Merge changes Ic26b25e7,I653571d6 into nyc-mr1-dev
am: e3a9785386

Change-Id: I7ec30088b0f24bb0a55fd0cf2637bff9a2c82670