fix possible mismerge

Change-Id: I03576d58331113a903133efd41e9dccc355adb2e
Merge remote-tracking branch 'cm/cm-10.1' into db42