Merge changes I6da93a4c,I5e987ac6,I104da410,Ia4ff718c,I7b837ca8 into nyc-dev am: a7c995cd am: 76739493 am: 28d2f9eb Change-Id: I8cd0643f5601680ec2733fb71e7d887de6a8a91f