am a6b76c35: am cd74c0d5: The vendor is about to check in a fix for this issue, the workaround is no longer needed

Merge commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0'

* commit 'a6b76c35a482bd7f2cbab186aca9ea6e74a375d0':
  The vendor is about to check in a fix for this issue, the workaround is no longer needed