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

Change-Id: I19c35bf283cb85204ff7b94d8d0d36c284e83600