Merge changes I896af608,I2e2a65bc,I8d9ae8b9,Ibb07666a into nyc-mr1-dev
am: 6ef2cee605

Change-Id: Iba80d00347392e94d99f5b17deeb8bbf6feaaea1