am 11e123f7: Merge "Check system app before removal" into jb-dev

* commit '11e123f7684378578242f5824e14ddba2f68d9ca':
  Check system app before removal