am a76a3571: Merge "Add support for enabling workarounds via metadata."

* commit 'a76a3571d2d7a4e4bfc1d416584705c4359e3cc2':
  Add support for enabling workarounds via metadata.