Merge "Avoiding potential NPE when dumping to proto."