Merge "Revert "Allow only released images in manifest"" into beijing