Bug: 383643519 Flag: EXEMPT bug fix Test: Manual Change-Id: I995a4a68f55f3de77cadf3eee20f72c0edb824f2