Merge "At install, require the presence of code if hasCode=true"