Lollipop changes from Krabappel2548