pulling upstream aospal changes