Merge "Add support for debug-overrides configuration" am: f1e813ea33 am: 467804448d
am: 3210b8b4da

* commit '3210b8b4da3c745420d3010028f2bb7071044262':
  Add support for debug-overrides configuration