cm: build: Fix cherry picking specific patchsets

Change-Id: I396a1218f141a1ff4cb45252cc01a1487c2afd31
1 file changed