Revert "Revert "Revert "bionic to temasek"""

This reverts commit 582573cf17f11e5fb9b537e91ead42ae35539a2a.