Merge changes I4d020811,I4aeda1f2

* changes:
  Always enable apk-in-apex before the apex (2/n)
  Don't return early on error (1/n)