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