Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c04580 am: 7c08c4d5
am: 963ca6f9

Change-Id: I1a509c39640e7f9d76bd2e420764aeb3d823a3df