Also, some cleaning of the comments. Bug: 289420844 Test: compiling Change-Id: I5dfb4b252755550059c3ee050bc491f5449bec97