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