Merge "Ensure that we check against the pending state while suspended." into oc-dev am: 70a8e86918
am: 1b7f4b3ce2

Change-Id: I85d75bbefaa02ec5b36741c4c5d9dba49fd5a483