rebase from latest CM recovery-cm sources