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

Change-Id: I8b4ce41accfaed815dba213d983b7dce081c1364