Fix resize functions

Change-Id: I074a704e76c5c42890d65d8235854a998f3e4af9
Merge "Fix resize functions"