Merge changes I97015365,Ic9db4b9b am: 942c83c757

Change-Id: Ic99385f58c7a0ee246d7dfeb12eb1723fda65c4b