Merge "Change mapping of .ota extension"