Merge "Switch fatalError to NPE" am: d70e6c1fca am: 37aebe67e3
am: 4eaaa4d72f

Change-Id: I7227c2cdaca158ae6f47315ca112ddf5ea740ee9