More Lollipop Changes

Change-Id: I7a1d0eeb1c12e55fef3df99139f1767e4234d28a