Merge "Enforce max size for resizing operations." into rvc-dev am: c43997ba15 am: 3f87a39a37

Change-Id: I7e87fd02b5f3ca3c6ed5f3812127fceda72ec75b