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

Change-Id: Id87155f46fcafba796d1d09e356e53b67df819ff