am 0546b1b1: am 7bc8f51a: Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev

* commit '0546b1b14939523f74534572538de4dcefba698b':
  Clean up obsolete pending timeout after restoring package metadata