Simplify warning to match

Change-Id: I0ae93467a603d4838f582c9ae59be40993937ed8
Merge topic 'SupressSomeWarnings' into next

aead738 Simplify warning to match