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

reverting double derp number 2...