Merge "Don't check OverrideAllowedState" into rvc-dev am: 12c93fbd am: 7b785f63 am: f3c7067c am: cfdff8c2 Change-Id: Idc29396c41c67ffa740c6a2d8dbefaedafac669f