Bug: 74123987 Test: Just changing comments. Change-Id: I7f21947a35d1baccf171346979164718386c5b71 (cherry picked from commit 50d2808b)