Bug: 242479757 Test: build pass on all Gchip devices Change-Id: Idfd52a88a420f04169b273a1ef575f10b92874c1