Merge "Avoid crashing when downloading MitM'd PAC that is too big" into klp-dev am: 96c045807b
am: 7c08c4d5cc

Change-Id: Idd0a3598ffac808a39703a23238b47a02bca66ed