Merge "Remove unwanted capabilitiy from the java-doc" into pi-dev am: 1856d61f9a
am: 1b8c42d15f

Change-Id: Ib02988daf44dabfaef7a0b788385b7f7c655b8b2