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

Change-Id: Idbe1b7495c9f4ebdd4363153cd916b2716cd621b