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

Change-Id: I59c6ddc48fad9178b03c7a1da7957238d4045ea7