Stabilize AOSPAL

Change-Id: I77cd10d55eb24a99dd0f8d1899115bb822630e58