Merge changes I7384149b,Ib4768c08 into nyc-mr1-dev
am: cc19a90255

Change-Id: Ic7ef7fdb73e97ff3d304827329722dad64f81fd8