[automerger skipped] Merge "Add workaround for b/124210145" am: 8402337237
am: c11ffe7ddc -s ours
am skip reason: change_id I6760f6e4068239361c495ae7c0de3e25f91d38e1 with SHA1 6651eb2142 is in history

Change-Id: I6d62b3d595d11bc63db3e602a6cdbfa5dc629a73