Bug: 65551293 Bug: 69390067 Test: None. Prebuilt only change. Change-Id: I62304b342a8b52fd505892cc2d4ebc882148224b