Merge "Update ENSURE_VERIFY_APPS javadoc" into oc-dev am: bb621fd95c
am: f1b54874f0

Change-Id: I55cee22df45d0e327b5c26e6768653bf3c7c7c4f