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

Change-Id: I6a72e1c2399fd03cd87de61964fc07e0329a8eb9