Revert "Revert "track bionic""

This reverts commit f0c66616b993150dcf4f1f7b280bd7e4ef03695a.