Merge "Fix a bug where small manifest isn't read"