Merge "Reduce disk space limit for incident reports." into pi-dev
am: a991071db9

Change-Id: I91a5bcc59ad1472832dfe0cf2e07216c8abf54f3