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

Change-Id: Ife708718061f8b2ee1cd7968ff90fc54ea6e570e