Merge changes Ic85892b4,I627e47c6
am: d995c94426

Change-Id: If036b0f5b8497667a9c2a916ec74d482def2aed5