Merge "Remove usage of ScopedLocalFrame because it is not needed" am: c37a9f8e87
am: ca0acf8b33

Change-Id: Ied750febfc855a37b3989f60a5b6e400c7b7bcb9