Defend against ICOs with large BMPs embedded DO NOT MERGE am: 6029322ad7 am: a7857dd90c am: c0e1e9fb47 am: 99ee7256eb am: 6df4eff07e  -s ours am: 37a097de93  -s ours
am: a7b6a6186f  -s ours

Change-Id: I32354aefbffb907b6d1f8480240a2279c39653fe