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

Change-Id: Ife1ee67f3c32618c6a42c26f649a52814724222f