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

Change-Id: I9c1efc14710a3a16087726f5d796d6510756f334