Merge "Don't check OverrideAllowedState" into rvc-dev am: 12c93fbd am: d1082db9 am: 170d4588 am: f6cdcddf Change-Id: Id85750250c56d1dc28dfdcc31552c49c0fe4beb0