am b4484758: am 137458b4: Use framework scheme definitions

* commit 'b44847581eb352b1dc74228133b661113370db1a':
  Use framework scheme definitions