Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: a7857dd90c am: c0e1e9fb47
am: 99ee7256eb

Change-Id: If1476da95e9b4663eefcbb6765e9f3c4ea5229ad