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

Change-Id: I110c0ca609e7e51d86345f659b09953f2ce6de2d