More Lollipop CM changes