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

Change-Id: I7550dd05b499a679918f596c51d1f9c8e5a484ff