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

Change-Id: I45b8ff3b3fe06e57189e74673404323e091aac02