Merge "Init: add OTA directory"