Merge "Don't check OverrideAllowedState" am: 86d1a3ec68

Change-Id: I7e3d6b5d26a3821f55f1fad555feb6f637413abe