Incorporate additional feedback to native JNI checks am: f41232eecb
am: 498716a35e

Change-Id: I4f9577ec19d65b555bcc4d2c18f4161719336981