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

Change-Id: I7f4905486978a3c0efb1c503ef1f8e4acd5d8b9a