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

Change-Id: I243d2e246ce97adc19a088b35249437c6a42a056