Merge changes Icac17694,Ic0b651f3,Ifa2cdea7

* changes:
  MAP MCE
  Pbap disconnect durring connect
  MAP MCE