Lollipop Updates

Change-Id: I5573d3c2f57e365152aae09cb51d740cd19735b0