am 680fac0c: am d606be25: Merge "Don\'t crash when component enable/disable...
am 680fac0c: am d606be25: Merge "Don\'t crash when component enable/disable broadcasts race with uninstall" into klp-dev
* commit '680fac0c':
Don't crash when component enable/disable broadcasts race with uninstall