Bug: 295394788 Test: make checkbuild Change-Id: I54b54db81ae68ef2997162d8e5d913cb1522f773 Merged-In: I54b54db81ae68ef2997162d8e5d913cb1522f773