Initial commit for lollipop