am 709ddd5c: Merge "Fixed multiple MAP issues." into lmp-dev

* commit '709ddd5c24ca276e0c2efc76c77ae375276cc080':
  Fixed multiple MAP issues.