Merge changes I46d9d8c1,I1ea15c14 into nyc-dev
am: 95f77a84d9

Change-Id: I63baa7afd38cd6c3d6852be930aa64df74bb975d