switch to our bionic - cherry-picked cm change