Merge "bufferhubd: Implement more DetachedBuffer logic" into pi-dev
am: c650f6215d

Change-Id: I9796b0d8960f60c0c3d80a8803f2a46ab2f065cc