Merge changes Ib44df099,I8508f96f
am: b0b2080b4c

Change-Id: Idb091aeaec8caf439dc5445c33b601fd6b4f7330