Merge "Revert "requestBwUpdate() public API review""