Add changes for Lollipop and TWRP configurations