Merge "Replace StackHandleScopeCollection with VariableSizedHandleScope" am: 480ddd6f58
am: aa35bb697a

Change-Id: Ic88c11155da5f20824ca12d872957778a62220b4