Backport patches from upstream's 0.46 branch
This gets us in sync with upstream's 0.46 branch bringing in some Wi-Fi and Cell Broadcast related fixes.
This gets us in sync with upstream's 0.46 branch bringing in some Wi-Fi and Cell Broadcast related fixes.