Revert "Revert "Changes for cm bionic"