Bug: None Test: make (change is only in comments) Change-Id: I0fe398460c7f388d270a20f60985707a49433671