Merge "Fix device mapper name clashes on non-A/B devices." am: 97d1fccd5b am: d7874a2fa9
am: 7f724ad4e9

Change-Id: I6fb8145db60fbb27b158908e5bb40cc2120315ce