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

Change-Id: Idc0a77a39ae79c38b10e52f0298b29f9466ef5d9