Merge commit 'febde5fc290eb422f78b47f393dc451394751d59' * commit 'febde5fc290eb422f78b47f393dc451394751d59': More bmgr work; fix clear-data signalling
Merge commit 'febde5fc290eb422f78b47f393dc451394751d59' * commit 'febde5fc290eb422f78b47f393dc451394751d59': More bmgr work; fix clear-data signalling