am 6cf77597: am 2dbea55e: am 134eac88: Merge "Move new script group API into ScriptGroup"

* commit '6cf775974c7dd99862fcd9d722bbb7a3b9449c85':
  Move new script group API into ScriptGroup