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

Change-Id: I576b448b5b1e778caf27078fe1f6167aebc9de08