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

Change-Id: I393606e9962aa494dff32ab64cab35333acdd37a