Merge "Don't fail if a target of type NONE has a NOTICE file present"