Merge "Merge "Fixed ScriptGroup finalizer for old API" am: 1d0b9e2f am: d976ea9e...
Merge "Merge "Fixed ScriptGroup finalizer for old API" am: 1d0b9e2f am: d976ea9e am: d6880b64" into nyc-mr1-dev-plus-aosp
am: d7e1c31b
* commit 'd7e1c31b':
Fixed ScriptGroup finalizer for old API
Change-Id: I5cbf14e11102f5c419a68a4c31ac3a5df1f487f4