Incorporate additional feedback to native JNI checks
am: f41232eecb

Change-Id: Ia80f8f06ccae6184caf1a13736c19ae4c7a5ee9e