Merge "Fixed shell manifest to use correct permission."