Reflect the new gating on android.