Merge "Fix device mapper name clashes on non-A/B devices."