Merge "fastboot: Fix flashing both slots with dynamic partitions." am: d016c75104 am: f7caae0a69
am: 664063a6b4

Change-Id: Ia1544d6604086b82d5a123c31731e8f8c147f1c0