Merge "Recovery: Loki patching support" into cm-10.2