Merge changes I8604c9d0,I436a3770,If89fd6d2,I6bad3e75 into nyc-mr1-dev am: 2c64636a24
am: 7c644e661e

Change-Id: Ib0eb6eab913cd3a9a39a3edecee476f779376c10