Disable two restriction for AOSP (XP3)