Bug: 37673161 Test: Comments-only change Change-Id: I4ceaecea39ab9d34ae8f03ec1bc9eddb2e1588ab (cherry picked from commit 434815c5)