am 12c0b66f: am a5c43674: am eb09f990: Merge "Make sure to maintain privilege when downgrading bundled apps" into klp-dev

* commit '12c0b66fcecee7671a2cf3e28fddfb9cfa0c679d':
  Make sure to maintain privilege when downgrading bundled apps