Merge changes from topic "cp-resize-params" am: 37cf4fd14b

Change-Id: I1a2576bab0b7c109be47e76e74618553e86aad94