Merge "fall back to generating full OTA if incremental fails" into lmp-dev