Fix merge error

Change-Id: I9a9ffebaac3364da3408b4c4703d47c159dc24ae
Merge remote-tracking branch 'cm/cm-10.2' into HEAD