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

Change-Id: I01fcb6aa2789aebfeffe8bb5999ce08c038a21c6