Add changes for Lollipop