master change to lollipop