Add changes for VanirAOSP Lollipop