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

derp #4 revert.