Batch of missing JavaDoc @inherits

Change-Id: Ie61d31e9e03862d9c00e1122cb360e630736e675
Merge remote branch 'upstream/master'