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

Change-Id: I07156ab1aec1415ed3c484da0fe3567896c073b7