Bring up lollipop branch
Pulled some stuff from CM