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

Change-Id: I27461e4f1d84d031751754e492cbabc0a3522a2e