BUG: 73724473 Test: Local build and boot Change-Id: I0052ef0f6ea74c43d5292e0a54a6ebfe5f980f0d (cherry picked from commit 9a2adf0b22defb3254f56f71d756bc18009ba1f9) (cherry picked from commit 37caa53c)