Revert ""Revert" Track own bionic"

This reverts commit b6ac9d70b99a97fd1eb94261dd07bc41ecf6df2e.