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

Change-Id: Ic65045d99826d051f918b77cade1caf5f186c993