Hack: Hack around ULS issue

Bug: 57091

Change-Id: I8d4983a432bf7f6197a0ae4159d9e07819f6c174
Merge "Hack: Hack around ULS issue"