Merge "Avoid crashing in RunDumpsysProto when not zipping" into pi-dev am: f7a23bd97a
am: 617877c1e3

Change-Id: I87358543536770adb20b446aec1895ca6f2d10e9