Merge "Fix problem with JavaDoc"
am: 8f33fcdc4b

Change-Id: I25fd01b35a2c1299304401a1333f737ee9252317