M7 msm bus

These were in the set of M7 commits recently pushed.  I cherry-picked all of them even though the error checks don't look important.  "Explicitly clear client..." looked like it could be fairly important though.