Merge "Control fault injection with config files instead of build flags" am: ed796b046d am: 24b3622933
am: 842f2d8ccf

* commit '842f2d8ccf4a5675b30a85e41aa3c391195e644b':
  Control fault injection with config files instead of build flags