Update from AOSPAL