Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881 am: fe5a42c88d
am: 11c1846444

Change-Id: Ia199f5e5996cff463c9fff2d2a397c8692d81cea