Also made file/class documentation more consistent. Change-Id: Ib21f42166ae0841e04c8af4fdcf59c0fa06f1738