pulling aospal changes upstream

Cross fingers for bacon fix!