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

Change-Id: I6881bd7466048e94e518fbf2a491c5ac044862c3