Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev
am: 7366e8c16a

Change-Id: I4f54b1b9c45294b2c3c43e0027ece1e8b38e335f