Merge "Map Errors.h\'s UNEXPECTED_NULL to NullPointerException" am: 0ded0da517
am: 4ff2cc0898

* commit '4ff2cc0898891488dce3917d105f15264b7742ce':
  Map Errors.h's UNEXPECTED_NULL to NullPointerException