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

Change-Id: I7c884e29ab5272c1cecade0da8cf4729e15351da