Merge "Fix a bug that may cause the ota generation fail."