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

Change-Id: Id9bf6970d3d9561613f200bf18b7eac6e0764ab4