Merge "Add timestamp to 16K boot OTA" into main