Merge changes Ieddc1113,Ia12217b3 am: 2c681345e8
am: b07a349b04

Change-Id: I32a2190c41205c4e92d3bf228c119e5cf6e82a84