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

Change-Id: Ib87a0ccfb1e1742e24850a8436f8f15d5b235ff4