am 42bfb12c: am 6d00d54e: Merge "Ensuring disabled packages remove all components on the workspace. (Bug 11172454)" into jb-ub-now-jetsonic

* commit '42bfb12c548fcd6c791a903c12d072988bfaa28c':
  Ensuring disabled packages remove all components on the workspace. (Bug 11172454)