Merge "Replace StackHandleScopeCollection with VariableSizedHandleScope"
am: 480ddd6f58

Change-Id: I76a21e5737f9a1f27cdd052f92142befa3ce1848