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

* commit 'c1be1d306f8a75b82f7866dbd88a9f57bd910a94':
  Add MapAnonymous handling for null error_str