Merge changes Ie8852caf,I9e9d1156