[automerger skipped] Merge "Don't check OverrideAllowedState" am: 86d1a3ec am: 188c8a09 -s ours am: 5c1e1c75 -s ours am: b48f51d7 -s ours am: daa09c5e -s ours

am skip reason: Change-Id I9c63f332337bc465115556fbc6f0b40fb7e102da with SHA-1 e9968908 is in history

Change-Id: I43ba8c7692397ce2764709693d97c98cebf0b26b