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

Change-Id: I286e79ebd04748294a3579543beb036ae00be7c3