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

Change-Id: I4ba61f2ff0e78a4d9b23714bd3620263c0c1cd2c