cm: build: Fix cherry picking specific patchsets

Change-Id: I9ba3486aaeb03ac0125ab06f01a41eaead84fcfd
1 file changed