Bug: 303286040 Test: Compiles Merged-In: I2d70f751867fe02ba2bc6958963e30f128630b00 Change-Id: I2d70f751867fe02ba2bc6958963e30f128630b00