am f5fa550a: Merge "Move new script group API into ScriptGroup class"

* commit 'f5fa550afafa2276abce78b3e5779ce11dc16c68':
  Move new script group API into ScriptGroup class