Merge "Javadoc: Added alternative to Package verification." into oc-dev am: 092349600d am: 33d476c170 am: 66e3c9aaf8
am: 210485221c

Change-Id: I6beec69db2fcdb2914859f7ff78974822dc40d8e