Merge changes Ib8369088,I743433bc
am: 8b951f5adc

Change-Id: I85db0865fab80bcf8c6e2cacf890c61c2dd2c458