Bug: 303172531 Test: Local build and tested pass. Change-Id: Ib3f4e489af0ca0032ed837fbd954805f20516ebe