pulling aospal changes upstream