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

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