Revert "Revert "pulling changes from aospa-legacy""

double derp, reverting previous revert in attempt to fix bork