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

Change-Id: Ibab963baf46b36329a8277369ca1bc92ac90b647