Merge "Revert "Switch fatalError to NPE""
am: 3c76c9ae05

Change-Id: I30bdb7cc77d4954266526185d654a47268aa93ad