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

Change-Id: If8dd66b422f0317b87033d2d9a590c5839df796b