Merge "Fix tests 116 and 118 for no-prebuild"