Bug: 333889822 Flag: EXEMPT Logging fix Test: EXEMPT Logging fix Change-Id: I9e1515c04bdc8381f96341e7211968fcc53f97cc