@dobey would love to try, but using android9 branch. Would be possible to sneak that commit there?