Merge "Fix OTA info persistence logic" into pi-dev am: ee7802f577
am: 08d7901d67

Change-Id: I49fbf44919c6bd7cd34845b9bce5437790be4af9