Merge "Update ENSURE_VERIFY_APPS javadoc" into oc-dev