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

Change-Id: I286dc67988a1c174873a4f366c7eb433591196ec