cm: rebase for lollipop