Bring in AOSPLS