Initial pass at supporting Lollipop.