4.20 Lollipop sample updates