Merge "Don't push handle scope for critical native generic JNI" am: cf42ad62df
am: 2b5f912538

Change-Id: Ia2ce952cae1f906fe75e99cb5316a1f519366a5b