Merge changes I546d7abc,I32163278 into nyc-mr2-dev am: df37f1fa74
am: 75bb16acc7

Change-Id: I2c1ddca5b51932008c7833b709cd7d1e809500ae