Switch to default branch 'lollipop' where it makes sense