Merge \"Do checks on the fault address when we think it\'s an NPE.\"
am: fdbc39551e

Change-Id: I7125db6461341e6e7b890af9633484a906ffb7b4