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

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