[automerger skipped] Merge changes from topic "cp-resize-params" am:...
[automerger skipped] Merge changes from topic "cp-resize-params" am: 37cf4fd1 am: f6a5d05c -s ours
am skip reason: Change-Id I4115120c8b6261c5518d561c043cda913d47dd45 with SHA-1 3ab17d6b is in history
Change-Id: I3b355d774b4ba40c336a2418f08861760a3941fb