am 7bc8f51a: Merge "Clean up obsolete pending timeout after restoring package...
am 7bc8f51a: Merge "Clean up obsolete pending timeout after restoring package metadata" into mnc-dev
* commit '7bc8f51a':
Clean up obsolete pending timeout after restoring package metadata