Bring in-line with AOSPAL