Otapreopt: Implement new A/B OTA path am: d089ca1703
am: 7d14f10de3

Change-Id: Id8e8eb09d0b01c94c2ae5a59a6ae25aab22a40a2