Commits from AOSPA-Legacy