Merge "Avoid crashing in RunDumpsysProto when not zipping" into pi-dev