Fix the alternate recovery inclusion logic

Change-Id: Ifb59d61dae44dd639d7f891dc57bb326b06b1118
Merge branch 'cm-10.2' into martincz