Merge changes I6da93a4c,I5e987ac6,I104da410,Ia4ff718c,I7b837ca8 into nyc-dev am: a7c995cd am: c41d0f75 am: 42ba07a8 Change-Id: I63399163c9d54c262147cf359e0dff310a1005e4