Merge changes Ibcc11ce7,I9867dc11
am: 89b03e0cfb

Change-Id: I841c764e1c9a69778ce840ec025815d20e1a06ab