lazy update from aospa-legacy
these too