Merge "Avoiding potential NPE when dumping to proto." am: a52b601ef3 am: 8964390dd3
am: 43908f112b

Change-Id: I73f14c4bebffe078a2b237947540dde11119d8ef