am dad1e31a: am 174943b3: Merge "fix more brokenness" into klp-modular-dev

* commit 'dad1e31a975f4c2416252e5318fa0b417bebeae8':
  fix more brokenness