Use Codeaurora Bionic enhancements