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

Change-Id: Ie515fab6efb13abb6cac499efe74afaea01f0967