Merge changes I6da93a4c,I5e987ac6,I104da410,Ia4ff718c,I7b837ca8 into nyc-dev am: a7c995cd am: 76739493 am: 28d2f9eb am: 4354acb5 am: 7fcb5e4f Change-Id: Id8baeb2f516a2c23fec716dc74a310e88a1fee68