am 595c48e4: am d570dae5: Merge "Fix priv-app edge case across OTAs" into klp-dev

* commit '595c48e43d8f40baaa8e281959300e582d765f56':
  Fix priv-app edge case across OTAs