Merge "Set a limit on the size for BMP images DO NOT MERGE" into nyc-dev am: b3f17fa860 am: 45a5f74c35 am: 95b4614e3f
am: 2e77de9d46

Change-Id: I9d7bf257605d6d89782b775a8fd461d113cc3125