Bug: 259592300 Test: build Change-Id: Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d Merged-In: Ic0e0ffcd576eed31a10d682bb0efdff5d1773b7d (cherry picked from commit 0986205d) (cherry picked from commit fcf9938e)