Merge "Add workaround for b/124210145"
am: 8402337237

Change-Id: I59c430f90a054d29699a4bfb67be4f7b4d9a6653