Add changes for VanirAOSP Lollipop and remove GSM