migrate: fix merge fail

Change-Id: Ic7caec90cd2c7bb977040d4e416016ca36ee4eea
Merge branch 'cm-10.1' into martincz