Merge "MAP MCE remove cancelDiscovery"
am: 92ccc38fba

Change-Id: If3d3b2d7f8f8dc7efb5f15384bcc560523f46b9b