Merge changes Iede18a00,Ib0fa24fb,Ic4c8a137 am: dfbae6ddbb
am: c2e2f36f63

Change-Id: Ice1c89ed2bad57433e99638d268cecbba2c9e2a3