Merge "Add MapAnonymous handling for null error_str"
am: 0c0a7a326b

* commit '0c0a7a326b3a76846d2a0b0e039cff877d43b588':
  Add MapAnonymous handling for null error_str