cherries: fix merge conflict for 2011 Xperia cherries

Change-Id: I92067e067b74b31e363ecc0fc706a2e1ec245b44
Merge "cherries: fix merge conflict for 2011 Xperia cherries" into pac-4.4