Merge changes I069e2b7e,Ic5e9e58a into nyc-dev
am: f4de8dd77c

Change-Id: I4cc7b4855573e8e5817c5166b5d0f6cdf3d3a4a8