Merge "Fix problem with JavaDoc" am: 8f33fcdc4b am: 4929aafc1d am: 290274df0d
am: d0a937e84b

Change-Id: Ic0e67021a5423b48bcf7d6ec8b903321d855e3aa