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