Merge changes Iafb91645,I56a0ec7b into nyc-dr1-dev
am: bcc30e06dd

Change-Id: I65122a9ae9abaed35324cc2c6d6db5ee49e2c68e