Merge "Switch fatalError to NPE"
am: d70e6c1fca

Change-Id: I15f2d9a4d7b59fb980e50a68a00b5673c826e694