Merge changes Ic1e2f5e8,Ida4a3fc1 into nyc-mr1-dev am: e2782906b5
am: 7590d55a00

Change-Id: If8a6a619eb48ce9c5b8114e5521dfb753bb36b08