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

Change-Id: Ie1f120a2b714336fa659a51f25ae4df196cf7e1e