Helps 'git grep' do its job better. Change-Id: Ia3c671df471d7ee4545aff3ea96c2bc104d0d025
Otherwise these show up in 'git grep' Change-Id: I82224673978c63b523750a2ec8b34ca248f4e309