Cleanup merge conflicts after merging Cobalt 24 support Change-Id: I802473fd11c1f83f490c1845063b360bfcc763f8