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

Change-Id: Iadf91f728260c235255a79871e6a5f9d3b884de2