KitKat -> Lollipop

Change-Id: I7c0b02d4217ea4258fab76fa78a6e23ba09f7bc4