Merge "Add workaround for b/124210145" into qt-dev
am: a8cf106193

Change-Id: I5b942321b38c08262b2721b586bee68036f91a77