Test: Presubmit Bug: 332663601 Bug: 332532966 Flag: NONE Change-Id: I1baf598210e4f326ac1fb53662a10a4f4359a5e5