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

Change-Id: Iad71c4ab10014a6db21b803509ebbd499974405a