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

Change-Id: Ide15bfcaa7b9242b81c44ddb27a590e2a90a34ea