Merge changes I46d9d8c1,I1ea15c14 into nyc-dev am: 95f77a84d9 am: c1b0be15c4 am: e01e278881  -s ours am: e11f92cdb3 am: 636552bdad
am: e0479f6bc9

Change-Id: Ia2e5b2aa473535902a7859655cea6f939c97c825