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

double derp revert number 3.....