Merge "Check for nullptr instead of JNI exception after using FindClass" am: bee8358ee7
am: 4ff3df5287

Change-Id: I65c32a8281a420e2a495dcde96ce9f0a6c4f5460