Merge changes Ic1e2f5e8,Ida4a3fc1 into nyc-mr1-dev am: e2782906b5 am: 7590d55a00
am: 06e3740780

Change-Id: Ib13780be738aca5e181fe1604bf01692184401ed