Merge "Fix OTA info persistence logic" into pi-dev