pulling changes from aospa-legacy

will revert if changes bork. massive pull