Revert "Revert "track bionic""

This reverts commit 87c9210cc94eee2cdcac319e8656e05425560e3b.