am ec3356e9: am 1cd88e3e: Use framework scheme definitions

* commit 'ec3356e973a5d3f227b3bee5cc3a3f35a689634e':
  Use framework scheme definitions