Merge changes If9baf6db,Idc6c5d7d into nyc-mr1-dev
am: 7f53b9bcb5

Change-Id: Ibaa6083c367cb1bac177a038573b748204300548