Merge "Framework: Be more verbose in A/B OTA" am: ed8ce39228
am: 1b2deff317

Change-Id: Iaaf41ba79f2cd5101219017bee240e02b6f355ed