Merge "Correct documentation in untrusted_app_all" into oc-dev