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

Change-Id: I604c5ae79fe66d9a2f0463b51770875be57655c1