Last few Lollipop sample updates in branch